merge with xen-unstable.hg
authorawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Thu, 15 Jun 2006 16:23:57 +0000 (10:23 -0600)
committerawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Thu, 15 Jun 2006 16:23:57 +0000 (10:23 -0600)
commit364f9d80285a951060649b2483592433998cdc01
treeb650fb64209a8f3352215c210c719195cd6a27f6
parente55daf766f2aadfb91a270c5b4b221c9fc35d40d
parent1bf1344c7ca70b2e47a059fedf131b09bfab1c09
merge with xen-unstable.hg